entry: Always clear handles for mouse interaction
authorMatthias Clasen <mclasen@redhat.com>
Mon, 8 Jun 2015 01:52:35 +0000 (21:52 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 8 Jun 2015 10:56:12 +0000 (06:56 -0400)
There were some cases where we left a handle visible
during mouse interaction, which is a little weird.

gtk/gtkentry.c

index 756176f9d8c4aadd65ab751e6aab111962ab87f6..c617a92a772d30539b635dcfa2cb5b5e063484af 100644 (file)
@@ -4536,12 +4536,14 @@ gtk_entry_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
         case 2:
           priv->select_words = TRUE;
           gtk_entry_select_word (entry);
-          mode = GTK_TEXT_HANDLE_MODE_SELECTION;
+          if (is_touchscreen)
+            mode = GTK_TEXT_HANDLE_MODE_SELECTION;
           break;
         case 3:
           priv->select_lines = TRUE;
           gtk_entry_select_line (entry);
-          mode = GTK_TEXT_HANDLE_MODE_SELECTION;
+          if (is_touchscreen)
+            mode = GTK_TEXT_HANDLE_MODE_SELECTION;
           break;
         default:
           break;
@@ -4572,8 +4574,7 @@ gtk_entry_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
       gtk_gesture_set_state (priv->drag_gesture,
                              GTK_EVENT_SEQUENCE_CLAIMED);
 
-      if (is_touchscreen)
-        gtk_entry_update_handles (entry, mode);
+      gtk_entry_update_handles (entry, mode);
     }
 
   if (n_press >= 3)